From 7a3a4ea6811f864e44c724a4e8c60ed19df8179a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Jul 2025 16:38:10 +0100 Subject: [PATCH] Rebase patch series --- .../patches/debian/Skip-test-pull-repeated-during-CI.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch index 24a1490d..fb706f55 100644 --- a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch +++ b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon McVittie 1 file changed, 4 insertions(+) diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh -index b3e0074..0c77546 100755 +index 51113b6..4cfe4c7 100755 --- a/tests/test-pull-repeated.sh +++ b/tests/test-pull-repeated.sh @@ -21,6 +21,10 @@ set -euo pipefail @@ -29,6 +29,6 @@ index b3e0074..0c77546 100755 + skip "Non-deterministic test will fail if we are unlucky" +fi + + skip_without_ostree_httpd + COMMIT_SIGN="" - if has_ostree_feature gpgme; then - COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}" -- 2.30.2